Scanner completed. Code has been refactored since last push