some code cleaning - September 4th, 2013