Cleaned code
Got rid of 'return' statements