cleaned up some code, removed unnecessary startup() function