Tidied up MainActivity