Update: Source code cleanup