Making the code more groovy
Also removing return types from methods