Made Scopes follow coding guidelines