Cleaned up and organized