Huge cleanup, style changes, refactoring
Removed slim