Cleaned up jetpack code