Gramer and code clean up