Added function headers to my functions

+ minor clean-up