Speed improvements, code cleanup