PPT changes and minor code refactoring