140905-iss003: optimize routines