Removed magic number
worked on reducing findbugs reports