Some code cleanup to follow libgdx guidelines...