Cleanup code, remove $ prefix from generated static methods and update README