Removed Indent
Replaced pointer with reference
added todos