organize more code