Addressed as suggested (Broke out name's initialization, re-indented constructor invocation)