Cleaning code, adding little things