Cleaned up main some more