Analysis function updates
Spring cleaning