cleaning up the code, shay howe tutorial