More code tweaks :)