Revert "Fixed some code"

This reverts commit 4119b7236d5c498e95040da09911d68d19055123.