[Issue #15] fixing as per review suggestions