Just some cleaning up - again

Mainly comments was added for deoxygen