W6A5 - assignment cleaned up and all tests passing