Alpha 27: Performance improvements and general code cleanup