Modified and formatted source classes