Removed spacing
Fixed spacing
Updated todo