refactored abit

Signed-off-by: Nicholas Lum <nicholaslum444@hotmail.com>