Cleaned it up a little bit. i think its good enough for mainline for now