Improved organize imports and code refector