Heavy Refactoring - Comments