Cleaned up and organized a bit more