tidied method signatures. removed redundant import.