Cleaning commented code
Removing duplicated code + padding