Minor code convention adjustments here and there
Use a much smaller sugar lib