organized more code