possible Function & Tetris Guidline fixes