Cleaned up master