Code cleanup and updating README