Cleaned up Register