Code cleanup and polish language