Complete Code Revision