Improve code and options