Minor modifications

[x] Added missing braces in the undefined part of the clean up code
[x] Proper indendation added to the encoder reconfiguration function