Singhania | Some clean up and finishing touch