Cleanup & add more details for rvm