Clean up, organize, and improve efficiency