Simplifying, removing spacing for now