Addressed remaining martin comments