Code clean up and additional options