Cleaned up Nova a bit

See #4