callbacks removed and refactored
indentation
Comments added