cleaned up formatting, fixed function naming