Cleaned use of ws
small formatting