Undo fuckup of removing method
Some cleaning and commenting