Mini refactoring : Added helper methods. Some little fixes