Added Comments, and refactored names.