Beautify again

Added comment stubbs & reformat