#52, Edited code for reviewing