* Code cleanup and additional parts beginning