Code refractoring and clean up. Changed Arg handling in Profiles a little