cleaned up main files