Cleaned up the static section