Fixed & clean up