Small edit, cleaned up some code.
Small edit, cleaned up some code.