Code tidyup
Upped the target SDK to 19