Fixed the nits dpino mentioned