Starting on cleaning up null checks & type casting