Minor optimizations in source code

[arjun12102019]

Gone through source code and observed minor improvements are required which are not breaking functionality, but better to address

Will make the code changes with advanced Java concepts