Cleaned somethings up, fixed a naming.