Cleanup
Basic style