Code cleanup

Just a few changes ;-)