Implemented review comments from Morten... Again.