More cleaning up

Also making it more android like :P