Lightweight and more elegant solution
Made code a lot nicer and visual tweaks