Removed todos and fixed hlint suggestions.