Further minimized source code