code cleanup standardizeation
refactored/cleaned code