Shrawan : 18 August : Moving method to appropriate class