Cleaned up workspace code. (WIP)