quick changes

separated functions for clarity.