Last comments and code optimizations