Cleaned up syntax

Just doing big things over here at the @HubridNoxx fork.