Wip

Clean up of files and white spaces