Cleaned up some files, a lot are still missing (style is not consistent).