fixed some syntax errors & tidied up code a little bit