Minor refactoring

Based on TortoiseSVN revision 25959

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>