Move Validation, Improved Output, Refactoring, Style