Code cleanup and translation ready