Cleaned up the static methods