Code housekeeping. comments added, naming convention enforced etc