Organized more, cleaned up