Implemented Thorsten's suggestions.