Cleaned up, organized, and improve a lot of code!