Code Clean up : POJO