Overloading done prettier, some minor style tweaks