Refactor code; Change comments