Avoid extra white spaces line:34, 48