Seriously cleaned up...