Removed some exception handling, cleaned up names