Help #57 and some cleanup