Slightly cleaned up