Working uploads & Code Cleanup