Commented my stuff, cleaned up a bit