cleaned up layout of main file