Major kang/clean up
credit google,cm,slim