Clean up
Separate logic and add US locale