cleanup
improving readability
update homework