Fixed name/removed unnecessarily stuff