Corrected author name, cleaned up code