More Refactoring

Removed Unnecessary calls to uploads_dir() deleted unnecessary comments and white space.