Fixed review issues. Made rake pass.