Tweaked for better formatting