More getting rid of pseudo-hungarian notation

Also more code cleanup, deleting commented out code, etc.