Reduced some of the usage statements in favour of better namespace usage.