Adding some style and modifying organization