minor code cleanup, removed \ namespace where not needed and removed () from returns