clean up method signatures
Clean up using