Fixed hint errors, cleanup