Added comments and security