Fix errors and over-complication