Organize/beautify code
Organize/beautify code