removed unneccessary test
added comments to improve readability
added custom 404 error handling

Story #42