Comment improvements, general refactor