Cleanup code and pretty things up
Avoid retaining self
Remove useless logs