Correct over-tabbing
Improve methods used for future