cleanup commented code and update internal naming conventions