Cleaned up cell.vhdl