Cleaned up construction