Fixed formatting
Merged with working workingspace