removed unecessary comments and refactored files