Commented a bit, moved things around