Removed colors on Windows
Fixed structure