Code clean up and fast-trigger mod