cleaned up the methods a bit...