Factored out positioning, and fixed style nits