Fixed indentation and removed //todo comments.