Updated padding & removed redundant code

Fixes #438