Playing with stuff and cleaning up code.