Got it working + housekeeping