* Remove duplicate method calls * DRY up duplicated code * Address code smells in concerns * Update based on PR feedback