code cleanup and prettification
comments