Code cleanup and edit readme