Code refactored - caps removed

Signed-off-by: BigDataPlayers <bigdataplayers@gmail.com>