Code clean up

Clean up code from template