Full code beautification, syntax and brace styling correcting and all lint fixes done. Needs peer-review @ritesh-pandey