Fix padding, close #1
Cleanup