Extras: Cleaned up more stuff, who the hell indented this shit anyway?