Tweaked my style more