Fixed code and de-minimized