Style cleanup
Better user/session management