Cleaned up Commons a bit