Cleaning code + serve option works