Refactored various post lecture