Cleaned up sections implementation and prefix usage