Cleaned up code a bit, made it look a *little* nicer and added GA