Rfinnigan changes

Please review this, @casey-collab
This line is also too long.