Final touch ups after thorough code review