srpgo method indentation and code clean-up