Rk build cleanups

Just reviewed this code, very elegant! These are just things I noticed that were easy to cleanup.