Commented a bit, cleaned up a bit