A lot has been shoveled around so that it looks cleaner.

Signed-off-by: Staartvin <mijnleraar@msn.com>