more cleanup. renamed main file for clarity