Rearrange method order in header and get rid of unreferenced variables in source.