Convert tabs to spaces, make code more "object-oriented", add new line to EOF