cleaned up method signatures a bit