Class 8 - removed test from template
Class 8 - Follow / UnFollow and tidy up code