Code optimization, Version 0.5.1b