diff --git a/scripts/cs/idea.sh b/scripts/cs/idea.sh
index 1c6a3cf..69d75b1 100644
--- a/scripts/cs/idea.sh
+++ b/scripts/cs/idea.sh
@@ -8,11 +8,11 @@ PROG="IntelliJ IDEA Community Edition"
 PROG_SHORT=idea-ce
 VERSION=idea-IC-171.4073.35
 TEMP_FILE=/tmp/ideaIC-2017.1.1.tar.gz
-FILE=/usr/local/$VERSION/bin/idea.sh
-FILE_DIR=/usr/local/bin/$VERSION/
+FILE_DIR=/usr/local
+FILE=$FILE_DIR/$VERSION/bin/idea.sh
 FILE_URL=https://download.jetbrains.com/idea/ideaIC-2017.1.1.tar.gz
-LINK=/usr/local/bin/idea-ce
-ICON=/usr/local/$VERSION/bin/idea.png
+LINK=$FILE_DIR/bin/$PROG_SHORT
+ICON=$FILE_DIR/$VERSION/bin/idea.png
 
 
 # Check that the current user is root
@@ -29,7 +29,7 @@ if [ ! -z "$1" ] && [ "$1" = "--remove" ]
 
     rm $LINK
     rm /usr/local/share/applications/jetbrains-idea-ce.desktop
-    rm -rf $FILE_DIR
+    rm -rf $FILE_DIR/$VERSION
 
     # Remove local links if they were created
     for i in `ls /home/`
@@ -46,13 +46,13 @@ else
     # Get the files
     wget -O $TEMP_FILE $FILE_URL 
     # Extract the files
-    tar -xf $TEMP_FILE -C /usr/share/java/
+    tar -xf $TEMP_FILE -C $FILE_DIR
 
     # Make a link
     ln -s $FILE $LINK
 
     chmod +x $LINK
-    chmod -R 755 $FILE_DIR
+    chmod -R 755 $FILE_DIR/$VERSION
 
     # Make a desktop file
     # IDEA's first time setup allows the user to make this file. Naming it as such means the user won't get a duplicate entry.
diff --git a/scripts/cs/jflap.sh b/scripts/cs/jflap.sh
index 2147658..31ea917 100644
--- a/scripts/cs/jflap.sh
+++ b/scripts/cs/jflap.sh
@@ -18,25 +18,38 @@ then
     exit
 fi
 
-# Install dependencies
-dnf install $DEPS -y
+## Removal
+# Check if remove flag was passed
+if [ ! -z "$1" ] && [ "$1" = "--remove" ]
+  then
 
-# Get the files
-curl -o $FILE $FILE_URL
+    rm $LINK
+    rm /usr/local/share/applications/$PROG.desktop
+    rm $FILE
+    rm /usr/local/share/icons/$PROG.jpg
 
-# Make a link
-cat > $LINK <<EOF
+else 
+
+    ## Installation
+    # Install dependencies
+    dnf install $DEPS -y
+
+    # Get the files
+    curl -o $FILE $FILE_URL
+
+    # Make a link
+    cat > $LINK <<EOF
 #!/bin/sh
 cd \$HOME
 java -jar $FILE
 EOF
 
-chmod +x $LINK
-chmod +x $FILE
+    chmod +x $LINK
+    chmod +x $FILE
 
 
-# Make a desktop file
-cat > /usr/local/share/applications/$PROG.desktop <<EOF
+    # Make a desktop file
+    cat > /usr/local/share/applications/$PROG.desktop <<EOF
 [Desktop Entry]
 Type=Application
 Version=7.0
@@ -48,7 +61,8 @@ Icon=/usr/local/share/icons/$PROG.jpg
 Terminal=false
 Categories=Education;Languages;Java;
 EOF
-
-# Get the icons
-mkdir -p /usr/local/share/icons
-curl -o /usr/local/share/icons/$PROG.jpg $ICON_URL
+    
+    # Get the icons
+    mkdir -p /usr/local/share/icons
+    curl -o /usr/local/share/icons/$PROG.jpg $ICON_URL
+fi