Prepare for next development iteration
Mark some methods as final