Project updated;
Code cleanup.