Commit f9d4d92b9afc30fcdd23f977d78631becc3b4d51

nelisky 2012-04-17T01:25:55

Some cleanup