Adding some tweaks based on Niklas' suggestions